Local entry support added