Could perhaps add some defines for these?