Updated stubs and classes based on review and test comments