Adding some generic stuff..