Added submit with basic features