added message bundle support