A little step towards cleaning the functionality usage