Refactor code. Add new Add Chidoan form