Incorporated changes in model classes