Updated to use appcompat