Data access moved to the plugin