Adds context
Avoids require twice; fix