Update skeleton implementation