Better smylink handling