WIP Improve build