Add build user data and fix some bug