#27: added Context management