Refactor Config labels, fix #286