Additions to make customization easier.

See diff ;-)