Updated to support latest changes