Updated for crystal 0.5.3