Renamed keys in selectFrom clause
Refactored error and callback handlers