Changed strucutre properties interface to something that makes a bit more sense.