Updated with configurable inputs