Reworked Module property calculator