Added login and Image support