Updated for interface