Removed need to specify fullstack, better error handling