Added more comprehensive set of commands.