Making it more configurable