Add more configurable options