Added some stuff in scala