Feature/smartlink