Added the Advanced interface and reorganized