Added some modules and made all a bit clean