FEATURE - Add find by id