Remove Id class till proper mapping implementation is resolved.