Added missing files and build