Added more console functionality