Refactored using solution wide properties.