Updated associations, validation and admin settings