Added Boat controller and context