Making it configurable