Adding references and some extra validation to admin