Fix context and validation