adding latest changes for Res plugin