Added presence validations and associations