added prop and attr enhancements