Added feature for build