Added proxy object instead of system properties