Module implementation
Removed old template