Changes for custom model redeisgn