Removed hard dependency on Target entity