Created another template stubs; some changes in model