Updated with more configurable options