Add locking

Expose App