Added destructuring to core and ship