Added support to binary entity