Moving section creation code to respective section handlers