Removed excessive method overloads in favor of optional parameters