Added lots of system methods