Added uniform support