improved memory usage and added project units, amounts, etc. in variants