Added #findWithId