Add the checks and also some missing get methods for model classes