Part of refactor #1