Remove new methods, change create methods to use structs