Add Context and Subject types