added smart support