Improve constant definition
Fix meta data parsing