Moved datasource setup to static block