Made further updates to data plugin and router