Move number types into defines
Added third define