added ugly service
make datasource static