Small fix on static methods
Added utilities code