Improved configurability