Added properties into wrappers. This is building up to #1