Added custom target entity and misc !