Fully wrap properties (#8)