D3, Vinay | #812 | Minor refactoring of business logic to API layer