Finish implementation of authorisation