Updating to support API doc auto-gen