Separated some methods to a helper