Revamping the numeric classes