Replaced stubs with full classes