architecture updated, pom updated, lazy initialization fixed