Updated for scala 2.10