Added use of apple maps + Fixed constraints