added kind model etc