Added Login and filters