Modified data model service to hide availability classes.