Added option to build only desired data