Updated the add and remove attribute methods to only be accessible within the package.