Make Make more versatile