First attempt at migration to Titan 0.4.2