Added property emulator