Added more protos. Enhanced property accessor