improved database support, apollo enhancements