Seperate code by using Handler-Template model, not any Handler yet
Resolve two conflicts