Feature/abstract common