Feature/omit generic constrains