Added snippet, modified behaviour for commands