added (unfinished) entity classes