Added more scala stuff