Further design improvements (work is still in progress).