Adding STI validations and classes