Moved bukiwish model to datastore