Updated defines and pragma marks