Make more mathods static