Refactor +more in v1.0