Adding static data API support