Add support for build tags