Updated the skeleton to the latest structure