Adjusting to local properties & replacing support library