Modified structure + added console support