Updated interface and functionality