Fix auto-id problem when migrating backwards (#157)
Avoid circular imports problems (#157)