added support for resolution using system properties