FW-472. Refactor