Adding mapping to endpoint 12 and 14