Added property proxies + type conversion
Fixing weird include issue