Shorthand support added