Properties interface

More cleanup