Use initializer instead of helper for client