Updated for nicer module interface
Added heading support
Added hr support