Added host-limit and deletionSupport