feature #3175: More refactor