Added default entity. Few more cleanups.