Moved some functions to the static area