Added support for taxes