MOB-104: Legacy support added