- Added better support for current commands.