Added support for build tags