Feature: api version 1 fixes