enhanced and making app plugable