Added cell size macros