Added two model classes