Updated the skeleton with new base template