Added optional context to eval