Removed circular imports and trajectory now supports migration