Replaced stubs with complete functions