Changed property loader to use system property instead of environment
property