Added base implementation