Added hacky property inference