Revamping interface
Interface changes