Added input definition editor and context object