Added the proper implementation information