Even more type safety that will come handy in the future