Add POO chapters