Added more to the skeleton