Move builder
Fix listeners and authenticators