Added some stuff for keys and  added author to all classes