Modify to work with crushbone