Base implementation added