Use proper classes where appropriate