Adding some refactors