Attribute escaping and updated phpdoc