Resolved post class refactoring.