Added support for less clutter