improved analysis and data sources deserialization