Move security before datasource