Updated BaseContext.php