added mapping table checks