Schema name changed
Schema name changed
Refactored; standarized