New oracle mapping issues
Removed debug