Merge "Refactoring before adding stricter validity checking"