Bring everything into a proper context to avoid overlooking