added shorthand support