Add missed components from initial commit based on deployment errors