Added some preliminary entities