Added new fill generation options