Fixed context in builder class