Added keys functionality and added supplier views