Better metadata handling
Fix property handling