[WIP] Slightly better interface for target class