Refactored, removed Resource entity left only specific entity.