Another attempt to reduce methods complexity