Updated interface. Fixed headers