Refactored for OpenAM v11