Added support for user/command specific defaults

Also added tests