Removed limitation of not being able to use variables in attributes