Upgraded Scalapi.