Migrated to version 2.0.4