Added the basic functionality