Add new structure to the constructors + add more private helpers