Add api-console version with optional thing fix