Moved scala props to top level