Added base for client