Updated class hierarchy, enabled reading schemas from resources