add additional check on id property + return the abject to custom usages