Merge new features and changes to generic resource

Please review my changes