(TODO) Fix super calls