[Users] build optimalization