Use enum more places