Added input service and some extension methods