- Using @ObjectId instead of type due a serialization problem
- Some minor changes