Use proper objects