Added new schema for NPG