Build command is smarter now