Code structure was changed