Making project more generic