Data Adapter functionality added