Added handling by prefix