added mapping function to singleton