Initial import from external codebase