Finished fixing AttributeHelper module.