Updated usage

More updates to follow