Added methods to rewritten structure