Updated for interface 1.50