Add code and test coverage