Major simplification of interface and refactoring