Moved defines to helpers