Adding flags to make prefix/suffix and push/pull support optional. True by default. No class name changes.