NPE fix
Add with* methods
Change create method to increase args to full.