Optimized the interface