Better coding of props