Some changes. Moved API to initializers