Work on target class for mirrors
Add conversion utilities