Added lots of commands and datasource changes

Please check if the datasource functions are configured properly.