Split up and expanded docs