Logic checks update for different types