Added runtime class definitions