Upgraded Hyperion to latest OOP work