Committing first approach. Needs to be validated when required feature exists in backend.