Keep code struture in models consistent