Update interface, more scalability