Updated API to use builder pattern rather than overloaded methods
Updated API to support builder approach rather than overloaded methods