Some more interface changes, needs testing and cleanup