[WiP] Adhere to super's signature