Now configurable via the constructor