Improve mimic module