Added enable flag