Add more configuration options #572