Some Changes for Designer