Made more functions static