Started working on returning right class in build()