Work on build command