Added missing parts (external dependencies not included)