Added missing files from the last refactor