new implementation
More stuff into schema