added city and building validations