Add new functions for client