Rearranged assets API declarations to avoid conflicts