Simplified code by using new interface