Feature/jose/updates