New module file
Adding exception handling, removing unnecessary methods