Added base setup