Added flatpage support