Added support for omission of *