1. SGenerator : Resource Parser
2. Some minor changes