changed Elastica branch
updated config management