performed minor fixes & renaming
introduced data collection/entity wrappers