Added registration and fix template