UDATED room model to return proper data