Added console support