Update to use a single init method