Changes in doc. Do it more maintanable.