Do we still need this to be configurable? I think we could remove it.