Added generic tags to static methods - didn't know I could!