implemented Context partially
minor Framework changes