Reduce more code duplication