Updated for v 1.5.0