Age layers added. General category layer simplified.