Added entities for DB