Updates and improvement of interface