Moving member validation outside of cycle, since it doesn't use annotation