Added support for alternate (cleaner) syntax