Some rework on the skeleton template