Add bcs support