Added base functioaality