Add better return type