Code refactored
Changed required v2 version from 2.0-a056 to 2.0-a057