Update interface and grammar