User smart lookup support added