Make build more generic