Move value hierarchy to a separate module