Yes, done. Also added unit tests for the same