Some documentation / pattern changes