Refactoring
Added base conveyor