Interface Updated

Interface updated and simplified