Added calls to super.init()