[0.5.3] Improve and expose model classes