Removed workaraound for datasource reconfiguration and added manifest