added margin service configurable via property