Additional updates to skeleton