Reintroduce companion object