Added init methods and misc