Improved annotations and phpDocumentor2 compatibility