Update to make more configurable