New API version. Implementation Fixes