Initial rework against better skeleton