Feature/beta 181 and others changes