Add skeleton support

Add skeleton support