Add stub classes
Minor update
Minor update