Separate out property wrapping into client category
Add int editor. Fix string code generation