Feature/199 add wlma features