improved surface properties handling