Added ID serialization
Added check for partial loaded properties