Re-add missing parts