Builder refactoring; reincarnation of the implementation targets