Updated with custom meta-boxes