Added controls for customizing output