New API version with additional structures and params