Updated for use with database v1.6.0.