More commands added and merged from other files