Better design, still changes of the definitions are vital