Moved feature and attribute position in feature template and attribute
template