Updated interface generation