Make more configurable, obey enabled config option