Improvements for Attributes and Uniform API