Development

remove static variables and check whether vocabulary is null before using it