Updated codebase to work with Scala 2.10.2