Make everything work after code refactor.