Working on build for SPM