Updated with more recent version of the support library