Add missing files (got them from the original fork)