TW: Changed package visibility to allow for extension.