Added finalbuilding classes