Added strategy and builder