More log improvements
Only add methods in server