Fix console api

Work in progress