Moved from static connection to pool