Some refactoring, new SG Price API