Added functions and better type control