1. Fixed deployment issue

2. Added database support