Added some integration to make things prettier
Better separation of responsabilities