Add more scala stuff