Updated addon with fixes in shorthand parsing