Updated for future release 0.5.2