Adding some useful stuff for a better codebase