Removing unnecessary references on builder
Added interactor parsing