Update for general model

Signed-off-by: Richard Lea <chigix@zoho.com>