Feature #2911: Polising refactor