Added class & method definition facilities