Added namespace to sample entities