Updated logic and conversation modules