Added more input types, is ready to use