Improve skeleton