Various changes
Added some statics