Added SQL join capabilities to the mapper