adjust to the change of webapp-core