Inserted the ability to override properties

But without tests, though. They will be added on a later upload