Extend api and fixtures