Fixing decorating dataAccess/dataStore