Further module interface changes