Don't pollute all classes - Also got rid of duplicated code