Added missing parts