Improve mock