Added context to the new classes