V1.1 - Added defines