Updated for Sclera version 2.1
Updated DataSource interface