Enhancement/scala