Added scala parsing functions
Imports better