Organize a bit more and implement the last foreseen utility functions