Development #6

* Added new layer for destroying circular dependency