Accurate. Technically management units and temporary units still exist, but our database groups them with bonus units, which is why I am also accepting simplified responses that only have the first two categories.
Response accepted as a qualifying submission.
Don't forget you can also earn points by scoring the clarity and helpfulness of other qualifying responses.