Added more interface, and minor changes to MAA