Add eye support and repaired migrations