Initial import with updates