Improve initializers