Feature: API version 1 fixes