Fixed CRUD on target-related entities