Database support added