TROIA-327 - Adapted base tutorial to the new API structure