Updated Skeleton framework