Added support for fences