Updated KVO Watches to support selective attribute watching

Signed-off-by: Darren Ehlers <me@darrenehlers.com>