Removing double implementation