Added regex mappers