Add more strictness and better data types.