Renaming functions and adding solution type