Added several defines for app fields