More entities added. Work on channels continued.