Removing Id interface
- Using Identity instead of Id