Added uniform functionality