Aligned variable types
Introduced ifdef conditions