Add missing requires, needs to be refactored later