Move create/delete logic into content storage class