Added variable type declaration
Fixed bad class name
Replace annotation comparison by regular expression match
Merged complete metadata when converting resource