Interface improvement 001