improve mock scaffold