Hemanth | #608 | Refactored - moved qualified-by to the constants.